Repository navigation
Fix all ofs with nullable properties in OpenAPI 3.1 specs - #25064
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
All reported issues were addressed across 4 files
Reply with feedback, questions, or to request a fix.
Re-trigger cubic
Contributor
There was a problem hiding this comment.
All reported issues were addressed across 4 files (changes from recent commits).
Reply with feedback, questions, or to request a fix.
Re-trigger cubic
Member
|
lgtm. thanks for the fix |
ondrej-simon
added a commit
to ondrej-simon/openapi-generator
that referenced
this pull request
Oct 6, 2026
The sample on master is out of date after OpenAPITools#25064 and OpenAPITools#25089 were merged concurrently, which fails the "Samples up-to-date" check.
3 tasks done
wing328
pushed a commit
that referenced
this pull request
Oct 7, 2026
…#25138) * [Java][webclient/restclient/resttemplate] Simplify generated API code - Only null-check optional header, cookie and form parameters (and use braces); required parameters are already validated to be non-null - Pass the request body to invokeAPI directly instead of through a redundant postBody local variable - Use the diamond operator for generic instantiations; for anonymous ParameterizedTypeReference classes only when targeting Java 17 - Set the java17 flag for resttemplate when using Jakarta EE and use it to select the Java version in its pom.xml and build.gradle (which also removes duplicated source/target elements with Spring Boot 4) * Update stale go-oneof-not-enum sample The sample on master is out of date after #25064 and #25089 were merged concurrently, which fails the "Samples up-to-date" check.
This was referenced Oct 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes an error where using all ofs with nullable properties in an OpenAPI spec causes the nullability to get lost.
For an example spec see modules/openapi-generator/src/test/resources/3_1/allof-nullable-type-array.yaml
In this example,
idshould be nullable in bothBaseandDerived, but in the generated code (e.g. using the php-nextgen) generator, it is only nullable forBase. That happens because the normalizer turns the 3.1 spec'stypes: ['string', 'null']intotype: stringandnullable: true, butAnnotationsUtils.cloneparses the spec as 3.1 where that property doesn't exist and therefore skips it.This should fix the following issues as well:
allOf, causing JsonException on null #23720 (csharp)PR checklist
Commit all changed files.
This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
These must match the expectations made by your contribution.
You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example
./bin/generate-samples.sh bin/configs/java*.IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
Summary by cubic
Fixes nullability being lost on properties merged into models via
allOfin OpenAPI 3.1 specs.cloneSchemanow restores thenullableflag on the clone and at every nested level (properties, array items,additionalProperties,not, and composed sub-schemas), since the OAS 3.1 serializer drops it. The normalizer rewritestype: [<type>, "null"]intonullable: true, so the flag must survive cloning. Resolves related generator issues for python-flask, typescript-axios, and csharp.Written for commit c7a1933. Summary will update on new commits.